use M::S
remove unused module
remove a few additional unfinished modules
move to M::S
add TODO
Merge branch 'topic/finish_sigs'