oh yeah - this was designed before some of the bigger modularization changes had been made, so yeah, it needs a revamp