Pretty much done refactoring Status