Adds more stuff

Still getting things together