refactored some things and began adding spazes