my part ends here for now

MERGE NOW OR ELSE