seems to pass tests now
removed incorrectly checked in files