Patches draft

by Nicholas Christowitz