Added a bunch of crap to sort out