Some stuff

Will work on it a bit more soon.