Now works .. still needs fomrs validation