Better commenting
General model refactoring. Move forms to respective companion objects.
General model refactoring continued. Move JSON reads/write/formats in
their respective companion objects.