First real commit, still some prelim bugs hanging out there.