Desperate try to get the thing modularized...