Coding done, need to run tests