Worked on everything

Did some TODOs and such