Cleaned up code a lot. Optimizations in full effect, need to fix ordering and Arch
Updated TODO file