Working 3b-1n template with doc'd fixmes

Change-Id: I9d4c04279f808cbeb183f081b83505f4ecfe9a23