Started making an attempt to factor parsing these things out separately from running them. Sound sensible?