More progress; showing form now, not correctly updating stack

Change-Id: If50c3bf9798845b9e415165291d9308807f5de6e