More stuff

Still not complete, but progress