3 Years Ago
More refactoring and fixes