WIP still having patch issues