Jesse/collab edit

Single line multi-imports are bad, mmmk