First big commit and things are broken but not terrible