organizing code to be more manageable
no tracker yet