Topic/status2

This moves us along, but doesn't achieve the goals set out by #26. That issue should be our next priority.