Huge commit, preparing for 1.0.0-alpha