Reorder methods
Fixes namespacing issues
Improve cookie, add server getter