beginning to rework feature modules. Does not compile yet!