Initial commit

Added second tidy up version