Almost done with prototype