Added initial status-response, began cleaning up view