Oct. 1 push

Most functionality and design done.