Started working on feature2

this willl be awesome
Finished feature2
Fixed line2 bug