Further devel

Have fun!
@mariogiov if possible I would remove this ASAP in order to not bring with us legacy code.