Work on prototypes

Change-Id: Id52d9ff6e2ba0ee5b84a27c7707b866151af7c50