finished converting all line breaks to new style
added ORM