Code drop and initial rework
More rework