Model.java + ModelList.java updated // not finished tho.