pp commit
Sorts out line issues, figures out other issues