Started Status re-factor
Merge pull request #140 from EnacheB/master

Started Status re-factor