Small changes for submission

Added an account for Geoffrey. Started working on tests.