First commit

Still need a few more comments