Got this all in - still some bugs.