Feature #64, refactored app