Updated server to condense logic and focus on API mocking