Intial working commit with new scaffolding.