After single print works, needs a restucture