Partial commit. Pushin partial from 11k'