Closing out spring #10 (shouldve been committed on friday)

Mostly accurate to the comps (have a few questions about presentation but I think jden's point about having an explicit style guide will answer them