Final proto development

Figuring out the final things