In-Progress - Rehandles memory usage and introduces a module system