Added Status helpers, split status into new file.
Rename methods
Added more coverage