Add server file and ajax call
Resolve merge
Remove lingering merge stuff