Beginnings of 0.0.7

Still needs to be better on fall back if key is wrong.
Nearly complete 0..0.7