working on this

and also this