urgg.. got to rewrite the adding routine