Cleaner now
Moved api logic to server, made sure