re-organizing and including a draft writable rake task