First commit

- still fixing some bugs