Almost finished FP Assignment 2