Got first test passing
Added in check for with and realizing missed edge case