First real commit, a nice looking draft.