Implemented my recent changes

Some stuff is a bit broken at the moment