Lots of changes that I should not be committing together but still