More refactoring. Losing lines fast.