Proto v1

Time to pull some very basic stuff into master