Made some changes, first commit
don't want objects of a static class