Lots of changes... horrible commit message