everything made modular, ready for new interface
everything made modular, ready for new interface