Added basic status checking, etc