Added more to the methods - needs major work - working on other laptop