I just refactored the shit out of this site