first working prototype
Pre sync check in
Merge fix