Finish implementing code