Reworked the server to better support other URL endpoints