Added and removed plenty of things, pretty messy