You're right, I've been treating this one file like a sketch pad for this work.  Pulling it apart is definitely worthwhile I think.