Initial updates to Navionics
Changes for sorting
Changes to branch