Prep work for status, refactored tests a bit
Add status command

Fixes #6