Implemented various things
Added a few things to the TODO List