DO NOT USE - Intermediate refactor

Just want to get 6 hours of work off my local machine...