Code freeze - Final changes

Fully refactored and running