Refactor and starting work on official view.