Made lots and lots of changes