Progress has been made
added the TODO shit