Getting rid of nested status block and moving status into base.