#135 - Goal sorting
Closes #135 - Goal sorting
Closes #141