Reorganizing, context implementaion started.