Work on adding lines
refactoring