moved methods, added apidoc