Added final changes to the prototype project and addressed many of the TODO remaining from the last commit