working on organizing code