Lots of reactoring - timelines, profile