statuses added
code cleanup, preparing to implement