Revert "Incomplete code. Initial draft of 1.0"

This reverts commit eccf957dbc3f423be834a7008ad90708870fe643.