merge with roman branch, tests are quirky, but that will be dealt with later
1.0.0