Add a few more responses, implement functions
Add a few more functions, clean up