braedcumbs refactored