First pass adding some of my functional.js features