Finish implementing prototype