Mission Accomplished. Time to Refactor

q