More work on new boundary system.