Dev

dev branch seems stable; pulling it in.