Added files from other project
History works
Refactored line handling