Modified endpoints. Commented out everything that's untested but will probably be added in the future.