Initial Work

still many more changes needed