GitHub #57 - Finish new model system