Added quick tripsheet
cleaned up model associations