First commit, with unfinished stuff.