reorganizing for horrid prototyping