J proto

Give this a look - maybe don't approve the pull yet though. I'm still working.

- J