server
server up
Server
server response in .json now
some UI shenanigans
merged stuff