Mostly UI changes, still need to implement UI-generation from JSON and hogan templates