Hopefully this commit will include my changes to the app...this has been a mess...