Reverting last commit, broke the hell out of it