Better trade parsing. Closes #6