Did a lot of prep work for new features/changes