Extract Functions, Two Ways

Complete and Continue