Added bunch of specs - still work to be done