updating to use models instead of dao direct