Replaced deleted file. Making model methods more dynamic.