moved the holder class to a new file
removed model class
uncommented tester
updated