beta app complete, simulator almost complete. Major commit.