First real commit, straighten everything out legal-wise.