Just testing new signature.

I still need to add a few function to it but should work ..........