Signature working
Still some bugs to fix