Alright, all refactored!