Quick update to 1.2 -- major rewrite pending