Trip actions refactor

Closes #6