Alright, last commit before things get really ugly.