Added a bit more stuff. Not done yet