Initial versions of code and test