Starting again, this is the last commit where this crap is in src.