More FP work
Merging