Code used for version 2.0

Version 2.0 of the app is based on the code committed, as well as work
for version 2.1.