Actually finished the prototype this time

#731