Added almost completed code for new support system