start adding docblocks
streamlining and performance