Initial real commit, still very alpha.