Cleaned stuff, started adding TODOs everywhere