added some statuses
Merge branch 'working'