Athran's initial work

Merge of Athran's initial work on the app