v0.3, big enhancements.