all parts done - some files tweaked for tests and may not work with the verifier