Yes, i am adding those things as we go, when needed tho....