Initial commit of assignment 2 solution