mako adds for JWR r1

with a few exceptions due to being unable to compile

Change-Id: I7f228fca79bfe9e8d5cad3cd88f8dc40154e6006