Final Code & Pattern Library Adjustments