Cleaning up
Make debug version work
Progress on making addFormalParams work properly