Started revising code for bit-based statuses