updating code and tests - not currently working though.