Initial commit with some clean up.