First commit

Currently not fully working