WIP__ put ready to compile to tomee