Add working patches
Move Rest into main