Committing a bunch of stuff

Adding stuff