Added status checking. Closes #2 and #3