Working on the v2.0.0 Update

WARNING: Unfinished work! Will continue this afternoon.