more mock work, made the models a bit more usable