Continued work on baffles

Design pdevty