Move item to another milestone

This is Cassandra and Jed's branch from the sprint. I just got it passing flake8 so it can be merged.