First real commit. Very much a work in progress.