Serious commit.  Basic functionality finished