project working, going to refactor