Massive refactoring, improved speed and size...