WIP: Begin to include patches