Minor cleanup need to start adding logic to the yellow circle