Done with most of the prototype