Break things up a little bit
Added spec