Finished basic feature parity with 1.0