Implemented Application stages
Merge branch 'working'