feature complete for 1.5