working on model methods and testing