Readd getStatus, clean up