3/4 Done

Worked with Ryan to fix his code, just missing Matt's code.