Further devel

Have fun!
Yessss, modularity!!!!!!