massive rebuild to make things really nice