Partial commit for #6