Did Some work on the core code.