continued work on model/controller thing