Added new scaffolding, unit tests... etc