Unfinished refactoring
Updated todo
Clean up, improved cursor
Giant refactoring