Pretty much done refactoring Status
Merge pull request #143 from EnacheB/master

Pretty much done refactoring Status