Added some methods - Broken for now