Initial check in
general tidy up

 getting ready for integration inline with stalk