First real commit

Seems to be working fairly well.