Further refactoring. Stuff's bust.