[WiP] Working on the Model