Not yet there, lots of confusion here and needs to be better organized