BASE BUILD  ATTEMPTED FIX (MAY BREAK STUFF)