First significant push. Most functionality ok.