Finalized first draft

@AlexKolpa didn't push the night he finished the first draft. This is a pro forma PR, we'll handle comments on this elsewhere