Dry run first

Lets method-ize this for ease of reading and testing..