Second commit.
Large swath of changes, moving towards an alpha release