Push the parsing into the class
Move and update specs to match new code structure