GUI v2, new models/controllers for persistent data
merge