Refactor our row building
Move initialization work into methods
Oh yeah, I'm just re-writing map