Version 2 Rewrite of Android Navigation App