Completed the Builder, added a licence and readme files. Minor additional refactoring