1st Commit. Still a work in progress.
Added some TODO items