First Major Commit! Still a lot of work to be done.