To do items, renamed variables, warning re: retiring Model.hs