added majority of line functionality
Merge pull request #1 from mosquito242/aj_lines

added majority of line functionality
merged master in