Bunch of stuff

Now I just need to put the data in the tables