Structure should now be "finalized" (ha!).  More attributes and what-not to add, but everything should be in place now to move forward.  Need to fix unit tests next.