diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..d5c23996f3b50c84dbf34883fd992cf1d0cae962
Binary files /dev/null and b/.DS_Store differ
diff --git a/README.md b/README.md
index 7432e83c335d0243adc355c235ea2a4e5fc1fe19..6de6aeb4f68933d8eb036351c31b20e994d83b26 100644
--- a/README.md
+++ b/README.md
@@ -1,92 +1,77 @@
-# Assignment1Render
-
-
-
-## Getting started
-
-To make it easy for you to get started with GitLab, here's a list of recommended next steps.
-
-Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)!
-
-## Add your files
-
-- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files
-- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command:
-
-```
-cd existing_repo
-git remote add origin https://git.gvk.idi.ntnu.no/MadsGreniArnesen/assignment1render.git
-git branch -M main
-git push -uf origin main
-```
-
-## Integrate with your tools
-
-- [ ] [Set up project integrations](https://git.gvk.idi.ntnu.no/MadsGreniArnesen/assignment1render/-/settings/integrations)
-
-## Collaborate with your team
-
-- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/)
-- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html)
-- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically)
-- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/)
-- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html)
-
-## Test and Deploy
-
-Use the built-in continuous integration in GitLab.
-
-- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html)
-- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/)
-- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html)
-- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/)
-- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html)
-
-***
-
-# Editing this README
-
-When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template.
-
-## Suggestions for a good README
-Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information.
-
-## Name
-Choose a self-explaining name for your project.
-
-## Description
-Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors.
-
-## Badges
-On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge.
-
-## Visuals
-Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method.
-
-## Installation
-Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection.
-
-## Usage
-Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README.
-
-## Support
-Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc.
-
-## Roadmap
-If you have ideas for releases in the future, it is a good idea to list them in the README.
-
-## Contributing
-State if you are open to contributions and what your requirements are for accepting them.
-
-For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self.
-
-You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser.
-
-## Authors and acknowledgment
-Show your appreciation to those who have contributed to the project.
-
-## License
-For open source projects, say how it is licensed.
-
-## Project status
-If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers.
+# Assignment 1
+
+The task of this assignment is to create 3 endpoints that provides the client to retrieve information about universities that may be candidates for application based on their name, alongside useful contextual information pertaining to the country it is situated in.
+The code is created in golang (VSC) and the application is depolyed using render.
+
+
+## API's
+The third-party API's in use in this assignment:
+- http://universities.hipolabs.com/
+- https://restcountries.com/
+
+
+## Endpoints
+
+The application has a default page and 3 resource root paths: \
+`/` \
+`/unisearcher/v1/uniinfo/`\
+`/unisearcher/v1/neighbourunis/`\
+`/unisearcher/v1/diag/`
+
+- For this application, an emty field for university name is not allowed. Standard is that all universities would be listed
+- A limiter parameter is added, to optionally decide a maximum amount of neighbouring universities
+
+
+## Spesifications
+
+For the specifications, the following syntax applies:
+
+
+- `{:value}` indicates mandatory input parameters specified by the user (i.e., the one using your service).
+
+- `{value}` indicates optional input specified by the user (i.e., the one using your service), where `value' can itself contain further optional input. The same notation applies for HTTP parameter specifications (e.g., {?param}).
+
+
+## Request methods
+-`GET` is the only implemented method.
+
+Path: uniinfo/{:partial_or_complete_university_name}/
+
+
+
+
+## Endpoints Info
+
+
+- Homepage
+The homepage gives the user some basic information about valid endpoints and refers to where the user can find more information about the service.
+
+
+- uniinfo/
+
+The initial endpoint focuses on return information about a country a particular university/ies (or universities containing a particular string in their name) is/are situated in, such as the official name of the country, spoken languages, and the OpenStreetMap link to the map.
+
+Note: The name of the university can be partial or complete, and may return a single ("Cambridge") or multiple universities (e.g., "Middle").
+Example request: uniinfo/norwegian%20university%20of%20science%20and%20technology/
+
+
+- neighbourunis/
+
+The second endpoint provides an overview of universities in neighbouring countries to a given country that have the same name component (e.g., "Middle") in their institution name. This does not include universities from the given country itself.
+
+Method: GET
+Path: neighbourunis/{:country_name}/{:partial_or_complete_university_name}{?limit={:number}}
+
+{:country_name} refers to the English name for the country that is the basis (basis country) of the search of unis with the same name in neighbouring countries.
+{:partial_or_complete_university_name} is the partial or complete university name, for which universities with similar name are sought in neighbouring countries
+{?limit={:number}} is an optional parameter that limits the number of universities in bordering countries (number) that are reported.
+
+- diag/
+
+The diagnostics interface indicates the availability of individual services this service depends on. The reporting occurs based on status codes returned by the dependent services, and it further provides information about the uptime of the service.
+
+
+## Deployment
+The final applicatiion is deployed on Render.
+
+
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000000000000000000000000000000000000..bcc97c479623a937d2a520a6ad16708b84df5c59
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,3 @@
+module assignment-1
+
+go 1.17
diff --git a/handlers/.DS_Store b/handlers/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..c749c04c5f0b3a67d6e47dfe5283f1bbebaf0433
Binary files /dev/null and b/handlers/.DS_Store differ
diff --git a/handlers/constants.go b/handlers/constants.go
new file mode 100644
index 0000000000000000000000000000000000000000..467be5fa062727b435fa7a11009b320ce9d5708b
--- /dev/null
+++ b/handlers/constants.go
@@ -0,0 +1,63 @@
+package handlers
+
+// REST web services
+
+// Provision of university information
+const COUNTRIES_URL = "https://restcountries.com/v3.1/"
+
+// Provides country information
+const UNIVERSITIES_HIPOLABS_URL = "http://universities.hipolabs.com/"
+
+// Constants for resource root paths
+const UNIVERSITYINFO_PATH = "/unisearcher/v1/uniinfo/"
+const NEIGHBOUR_UNIVERSITIES_PATH = "/unisearcher/v1/neighbourunis/"
+const DIAG_PATH = "/unisearcher/v1/diag/"
+const DEFAULT_PATH = "/"
+
+/*
+The Universities struckture defines the parameters to gather from the universities
+Matches the structure that is being returned
+*/
+
+type Universities struct {
+	Name         string   `json:"name"`
+	Country      string   `json:"country"`
+	WebPages     []string `json:"web_pages"` //WebPages is inside an array
+	AlphaTwoCode string   `json:"alpha_two_code"`
+}
+
+//The Countries struct defines the parameters to retrieve for countries
+
+type Countries struct {
+	Languages map[string]string `json:"languages"` //Using map because of {}
+	Map       map[string]string `json:"maps"`
+}
+
+//The UniInfo struct combines the information about Universities and Countries
+
+type UniInfo struct {
+	Name      string            `json:"name"`
+	Country   string            `json:"country"`
+	Isocode   string            `json:"isocode"`
+	WebPages  []string          `json:"web_pages"`
+	Languages map[string]string `json:"languages"`
+	Map       map[string]string `json:"maps"`
+}
+
+//The NeighbourBorders struct defines the borders of neighbouring countries
+
+type NeighbourBorders struct {
+	Cca3    string   `json:"cca3"`
+	Borders []string `json:"borders"`
+}
+
+//The NeighbourCountries struct defines the names of neighbouring countries
+
+type NeighbourCountries struct {
+	Names struct {
+		Common string `json:"common"`
+	} `json:"name"`
+}
+
+// Constant for linebreak
+const LINE_BREAK = "\n"
diff --git a/handlers/defaultHandler.go b/handlers/defaultHandler.go
new file mode 100644
index 0000000000000000000000000000000000000000..77781d5de93d21ade311aaa2e7d2d22c72217329
--- /dev/null
+++ b/handlers/defaultHandler.go
@@ -0,0 +1,37 @@
+package handlers
+
+import (
+	"fmt"
+	"net/http"
+)
+
+/*
+DefaultPage handles the homepage.
+Defines a message to the user and tells the user which endpoints are valid and where to find more information.
+*/
+func DefaultPage(w http.ResponseWriter, r *http.Request) {
+
+	defaultMessage := "THE UNIVERSITY SEARCH SERVICE " +
+		LINE_BREAK + LINE_BREAK +
+		"This is the University Search Service that makes it possible to retrieve information about universities" +
+		"that may be candidates for application based on their name, alongside useful information." +
+		LINE_BREAK + LINE_BREAK +
+		"Use one of these paths to explore endpoints:" +
+		LINE_BREAK + LINE_BREAK +
+		UNIVERSITYINFO_PATH +
+		LINE_BREAK + LINE_BREAK +
+		NEIGHBOUR_UNIVERSITIES_PATH +
+		LINE_BREAK + LINE_BREAK +
+		DIAG_PATH +
+		LINE_BREAK + LINE_BREAK + "Status Code:"
+
+	// Error Handling for the welcome message
+	_, err := fmt.Fprintf(w, defaultMessage)
+	if err != nil {
+		http.Error(w, http.StatusText(http.StatusBadRequest)+": "+err.Error(), http.StatusInternalServerError)
+		return
+	}
+
+	// Return status code OK
+	http.Error(w, LINE_BREAK+http.StatusText(http.StatusOK), http.StatusOK)
+}
diff --git a/handlers/diagnosticsHandler.go b/handlers/diagnosticsHandler.go
new file mode 100644
index 0000000000000000000000000000000000000000..0ef19f5b1ed9a98dd6ac71de5ec5c5f40b2e42be
--- /dev/null
+++ b/handlers/diagnosticsHandler.go
@@ -0,0 +1,101 @@
+package handlers
+
+import (
+	"fmt"
+	"io"
+	"net/http"
+	"time"
+)
+
+// TimeUp define a variable to track the time.
+// TimeStarter starts the timer when the application is started
+
+var TimeUp time.Time
+
+func TimeStarter() {
+	TimeUp = time.Now()
+}
+
+/*
+EntryPointHandler handles entry points and only accepts the valid methods (http request : Get Method)
+If any other method, error code is returned
+*/
+func EntryPointHandler(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		DiagHandler(w, r)
+	default:
+		http.Error(w, "Method not supported. Only these methods are supported:"+
+			LINE_BREAK+http.MethodGet, http.StatusNotImplemented)
+		return
+	}
+}
+
+//DiagHandler is a diagnostic handler for the endpoint to show statuscodes for api's and uptime for application.
+
+func DiagHandler(w http.ResponseWriter, r *http.Request) {
+
+	var statusUniversityApi int
+	var statusCountryApi int
+
+	// Sets type to the json format
+	w.Header().Set("Content-Type", "application/json")
+
+	// responseUniversities gets the status code for the universities api.
+
+	universitiesRespons, err := http.Get(UNIVERSITIES_HIPOLABS_URL)
+	// If error occurs, the error is handled and returned to the user.
+	if err != nil {
+		// Error code 500 is given since the api is unavailable.
+		http.Error(w, LINE_BREAK+err.Error(), http.StatusInternalServerError)
+		statusUniversityApi = http.StatusInternalServerError
+		return
+	} else {
+		// The API´s status code is set to statusUniversityApi, since no error is given
+		statusUniversityApi = universitiesRespons.StatusCode
+		defer func(Body io.ReadCloser) {
+			err := Body.Close()
+			if err != nil {
+				http.Error(w, LINE_BREAK+err.Error(), http.StatusInternalServerError)
+				return
+			}
+		}(universitiesRespons.Body)
+	}
+
+	// countriesRespons gets the status code for the countries api.
+
+	countriesRespons, err := http.Get(COUNTRIES_URL + "all")
+	// If error occurs, the error is handled and returned to the user.
+	if err != nil {
+		// Error code 500 is given since the api is unavailable.
+		http.Error(w, LINE_BREAK+err.Error(), http.StatusInternalServerError)
+		statusCountryApi = http.StatusInternalServerError
+		return
+	} else {
+		// No error is given, sets the apis status code to statusCountryApi
+		statusCountryApi = countriesRespons.StatusCode
+		defer func(Body io.ReadCloser) {
+			err := Body.Close()
+			if err != nil {
+				http.Error(w, LINE_BREAK+err.Error(), http.StatusInternalServerError)
+				return
+			}
+		}(countriesRespons.Body)
+	}
+
+	_, err = fmt.Fprintf(w, `{"universitiesapi": "%v", 
+							  "countriesapi": "%v", 
+							  "version": "v1",
+							  "uptime": "%v seconds"}`,
+
+		statusUniversityApi,
+		statusCountryApi,
+
+		int(time.Since(TimeUp)/time.Second))
+
+	if err != nil {
+		//Unknown error, If not printed - Error is printes
+		http.Error(w, LINE_BREAK+http.StatusText(http.StatusForbidden)+err.Error(), http.StatusForbidden)
+		return
+	}
+}
diff --git a/handlers/neighbouringUniHandler.go b/handlers/neighbouringUniHandler.go
new file mode 100644
index 0000000000000000000000000000000000000000..63c6405f4590bdd97a4d900f16377d3350bc9992
--- /dev/null
+++ b/handlers/neighbouringUniHandler.go
@@ -0,0 +1,182 @@
+package handlers
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+)
+
+/*
+EntryPointHandlerNeighbouringUnis handles entry points and only accepts the valid methods (http request : Get Method)
+If any other method, error code is returned
+*/
+func EntryPointHandlerNeighbouringUnis(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		NeighbouringUnisHandler(w, r)
+	default:
+		http.Error(w, "Method not supported. Only these methods are supported:"+
+			LINE_BREAK+http.MethodGet, http.StatusNotImplemented)
+		return
+	}
+}
+
+/*
+NeighbouringUnisHandler handles GET requests for Neighbouring Universities
+*/
+func NeighbouringUnisHandler(w http.ResponseWriter, r *http.Request) {
+
+	// Defining variables
+	var countryName string
+	var universityName string
+	var limit int
+	var neighbouringBorders []NeighbourBorders
+	var neighbouringNames []NeighbourCountries
+	var countries []Countries
+	var universityInfo UniInfo
+	var universities []Universities
+
+	// Content type header
+	w.Header().Add("content-type", "application/json")
+
+	// URL is splitted into segments
+	urlSegments := strings.Split(r.URL.Path, "/")
+
+	// Checks the URL format
+	if len(urlSegments) != 6 || urlSegments[3] != "neighbourunis" {
+		// Error code 400 is given for incorrect input in the URL
+		http.Error(w, "The format of the URL is not correct. Correct the input! ", http.StatusBadRequest)
+		return
+
+	} else {
+		// Gets countryName, universityName and optional limit from the URL.
+		countryName = urlSegments[4]
+		universityName = urlSegments[5]
+		// Checking if limit contains any information
+		if r.URL.Query().Get("limit") != "" {
+			// If limit contains something, try to convert to int and handle potential errors
+			var err error
+			limit, err = StringToInt(w, r.URL.Query().Get("limit"))
+			if err != nil {
+				return
+			}
+		}
+	}
+
+	// Space handling
+	countryName = SpaceHandler(countryName)
+	// Checks if the country input exist
+	countryURL := COUNTRIES_URL + "name/" + countryName
+	// Creates a response
+	response := MakeResponse(w, countryURL)
+	// Reads the response body
+	body := ReadBody(w, response)
+
+	// Unmarshal the body
+	err := json.Unmarshal(body, &neighbouringBorders)
+	//Error if country not found
+	if err != nil {
+		http.Error(w, "Could not find any country with the name: "+countryName, http.StatusNotFound)
+		return
+	}
+
+	// Appending the original country to the list to search through for universities
+	neighbouringBorders[0].Borders = append(neighbouringBorders[0].Borders, neighbouringBorders[0].Cca3)
+
+	// Searching through all the borders and convert the alpha two code to the full name in order to use the name in the university api
+	for i := range neighbouringBorders[0].Borders {
+		// Defining the countryURL with the alpha two code
+		countryURL = COUNTRIES_URL + "alpha/" + neighbouringBorders[0].Borders[i]
+
+		// Creates a response
+		response = MakeResponse(w, countryURL)
+
+		// Reads the response body
+		body = ReadBody(w, response)
+
+		fmt.Printf("Body: \n%v\n", string(body))
+
+		// Unmarshal the body to retrieve the country data
+		err = json.Unmarshal(body, &neighbouringNames)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusNotFound)
+			return
+		}
+
+		// Retrieves the full country name to use as search parameter
+		countryName = neighbouringNames[0].Names.Common
+
+		// Handling spaces in the university name
+		universityName = SpaceHandler(universityName)
+
+		// Defining the full universityURL containing the university name as parameter.
+		universityUrl := UNIVERSITIES_HIPOLABS_URL + "search?name=" + universityName + "&country=" + countryName
+
+		// Creates a response
+		response = MakeResponse(w, universityUrl)
+
+		// Reads the response body
+		body = ReadBody(w, response)
+
+		// Unmarshal the body to retrieve the university data
+		err = json.Unmarshal(body, &universities)
+		if err != nil {
+			http.Error(w, http.StatusText(http.StatusBadRequest)+": "+err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		// Checks if no universities were found
+		if len(universities) == 0 {
+			http.Error(w, "Could not find any universities with the name: "+universityName+", in: "+countryName, http.StatusNotFound)
+		}
+		// Checks if any universities were found
+		if len(universities) > 0 {
+			// If so, prints them out
+			for i = range universities {
+				// Looking through the universities and finding the corresponding country information
+
+				// Creates a response
+				response = MakeResponse(w, countryURL)
+				// Reads the response body
+				body = ReadBody(w, response)
+
+				// Retrieves the data about the country
+				err = json.Unmarshal(body, &countries)
+				if err != nil {
+					http.Error(w, http.StatusText(http.StatusInternalServerError)+": "+err.Error(), http.StatusInternalServerError)
+					return
+				}
+
+				// Combining the data from two API´s
+				universityInfo.Name = universities[i].Name
+				universityInfo.Country = universities[i].Country
+				universityInfo.WebPages = universities[i].WebPages
+				universityInfo.Isocode = universities[i].AlphaTwoCode
+				universityInfo.Languages = countries[0].Languages
+				universityInfo.Map = countries[0].Map
+
+				// If limit, the for loop will run until the limit
+				// If no limit, the loop will run until all universities has been iterated
+				if limit != 0 {
+					if i < limit {
+						message, err := json.Marshal(&universityInfo)
+						_, err = fmt.Fprintf(w, string(message)+","+LINE_BREAK)
+						if err != nil {
+							http.Error(w, http.StatusText(http.StatusBadRequest)+": "+err.Error(), http.StatusInternalServerError)
+							return
+						}
+					}
+				} else {
+					// Marshal and print the combined information
+					message, err := json.Marshal(&universityInfo)
+					_, err = fmt.Fprintf(w, string(message)+","+LINE_BREAK)
+					if err != nil {
+						http.Error(w, http.StatusText(http.StatusBadRequest)+": "+err.Error(), http.StatusInternalServerError)
+						return
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/handlers/sharedHandlers.go b/handlers/sharedHandlers.go
new file mode 100644
index 0000000000000000000000000000000000000000..7e35471a61b0b56b42a752b2702cd93a6b7dedd6
--- /dev/null
+++ b/handlers/sharedHandlers.go
@@ -0,0 +1,66 @@
+package handlers
+
+import (
+	"io/ioutil"
+	"net/http"
+	"strconv"
+	"strings"
+)
+
+/*
+SpaceHandler handling spaces in the URL by converting the spaces to
+it's ASCII character-set: %20
+*/
+
+func SpaceHandler(url string) string {
+	if strings.Contains(url, " ") {
+		url = strings.ReplaceAll(url, " ", "%20")
+	}
+	if strings.Contains(url, "-") {
+		url = strings.ReplaceAll(url, "-", "%20")
+	}
+	if strings.Contains(url, "_") {
+		url = strings.ReplaceAll(url, "_", "%20")
+	}
+	return url
+}
+
+/*
+StringToInt tries to convert String parameter to int
+*/
+func StringToInt(w http.ResponseWriter, s string) (int, error) {
+	var result int
+	result, err := strconv.Atoi(s)
+	//If it cant be converted, error is returned
+	if err != nil {
+		http.Error(w, "Could not convert litmit input to int: "+err.Error(), http.StatusNotFound)
+		return 0, err
+	}
+	return result, err
+}
+
+/*
+MakeResponse creates a response and returns it
+*/
+func MakeResponse(w http.ResponseWriter, url string) *http.Response {
+	// Creates a response
+	response, err := http.Get(url)
+	if err != nil {
+		http.Error(w, "Error while creating a response: "+err.Error(), http.StatusInternalServerError)
+		return nil
+	}
+	return response
+}
+
+/*
+ReadBody reads the body and returns it
+*/
+func ReadBody(w http.ResponseWriter, response *http.Response) []byte {
+	// Reads the response body.
+	body, err := ioutil.ReadAll(response.Body)
+	if err != nil {
+		http.Error(w, "Error while reading the body: "+err.Error(), http.StatusBadRequest)
+		return nil
+	}
+	return body
+}
diff --git a/handlers/uniInfoHandler.go b/handlers/uniInfoHandler.go
new file mode 100644
index 0000000000000000000000000000000000000000..2852172b7a17aaaa543d7fefec07633eef7e59e4
--- /dev/null
+++ b/handlers/uniInfoHandler.go
@@ -0,0 +1,119 @@
+package handlers
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strings"
+)
+
+/*
+UniversityEntryPointHandler handles entry points and only accepts valid methods
+*/
+func UniversityEntryPointHandler(w http.ResponseWriter, r *http.Request) {
+	switch r.Method {
+	case http.MethodGet:
+		handleGetUniversityInfoMethod(w, r)
+	default:
+		http.Error(w, "Method not supported. Only these methods are supported:"+
+			LINE_BREAK+LINE_BREAK+http.MethodGet, http.StatusNotImplemented)
+		return
+	}
+}
+
+/*
+handleGetUniversityInfoMethod handler for GET requests
+Creates a response and prints the results to the user
+*/
+func handleGetUniversityInfoMethod(w http.ResponseWriter, r *http.Request) {
+
+	// Defining variables (Alle må følge oppsettet)
+	var countryUrl string
+	var countries []Countries
+	var universityInfo UniInfo
+	var universities []Universities
+
+	// Write content type header (best practice)
+	w.Header().Add("content-type", "application/json")
+
+	// Splits up the URL into segments
+	urlSegments := strings.Split(r.URL.Path, "/")
+
+	// Checks that the URL contains 5 elements or the 6'th element is space from "/"
+	// Anything else is the wrong format for the url.
+	if len(urlSegments) != 5 || urlSegments[3] != "uniinfo" {
+
+		// Gives the error code 400 for incorrect input in the URL
+		http.Error(w, "There is an error with the url! Please correct the input and try again! ", http.StatusBadRequest)
+		return
+	}
+
+	// Defining the university name. The fifth element should always be the name of the university if entered correctly by the user.
+	universityName := urlSegments[4]
+	// Handling spaces in the URL
+	universityName = SpaceHandler(universityName)
+
+	// Checks if the university name is given.
+	// If it is not given, the API will return all universities in the world...
+	// To avoid this, an error is thrown and stops the service
+	if universityName == "" {
+		// Gives the error code 400 for incorrect input in the URL
+		http.Error(w, "The URL is missing a name for the university, please specify a university and try again!", http.StatusBadRequest)
+		return
+	}
+
+	// Defining the full universityURL containing the university name as parameter.
+	universityUrl := UNIVERSITIES_HIPOLABS_URL + "search?name=" + universityName
+
+	// Creates a response
+	response := MakeResponse(w, universityUrl)
+
+	// Reads the response body
+	body := ReadBody(w, response)
+
+	// Unmarshal the body to retrieve the university data
+	err := json.Unmarshal(body, &universities)
+	if err != nil {
+		http.Error(w, http.StatusText(http.StatusBadRequest)+": "+err.Error(), http.StatusBadRequest)
+		return
+	}
+	if len(universities) == 0 {
+		http.Error(w, "Could not find any universities with the name: "+universityName, http.StatusNotFound)
+		return
+	}
+
+	// Looking through the universities and finding the corresponding country information
+	for i := range universities {
+		// Country URL
+		countryUrl = COUNTRIES_URL + "name/" + universities[i].Country
+
+		// Creates a response
+		response = MakeResponse(w, countryUrl)
+		// Reads the response body
+		body = ReadBody(w, response)
+
+		// Retrieves the data about the country
+		err = json.Unmarshal(body, &countries)
+		if err != nil {
+			http.Error(w, http.StatusText(http.StatusInternalServerError)+": "+err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		// Combining the data from the university api and the country api
+		//Blir returnert fra apien og legger infoen inn i structcten, UniInfo er definert lengre oppe
+		universityInfo.Name = universities[i].Name
+		universityInfo.Country = universities[i].Country
+		universityInfo.WebPages = universities[i].WebPages
+		universityInfo.Isocode = universities[i].AlphaTwoCode
+		universityInfo.Languages = countries[0].Languages
+		universityInfo.Map = countries[0].Map
+
+		// Marshaling the combined information and prints it to the user
+		message, err := json.Marshal(&universityInfo)
+		_, err = fmt.Fprintf(w, string(message)+","+LINE_BREAK)
+		if err != nil {
+			http.Error(w, http.StatusText(http.StatusBadRequest)+": "+err.Error(), http.StatusInternalServerError)
+			return
+		}
+	}
+}
diff --git a/main.go b/main.go
new file mode 100644
index 0000000000000000000000000000000000000000..bea479126e729f34533b7389ef46ae1920d7a254
--- /dev/null
+++ b/main.go
@@ -0,0 +1,47 @@
+package main
+
+import (
+	"assignment-1/handlers"
+	"log"
+	"net/http"
+	"os"
+)
+
+/*
+
+The main.go starts the application
+
+1. The timer that keeps track of the uptime is startes
+2. Port 8080 is set as default
+3. The four different endpoints are handled
+
+*/
+
+func main() {
+	// Start the timer to track the uptime of the application
+	handlers.TimeStarter()
+
+	// Handling port assignment
+	port := os.Getenv("PORT")
+	if port == "" {
+		log.Println("PORT is set as default: 8080")
+		port = "8080"
+	}
+
+	// Set up handler endpoints
+
+	//Welcome message
+	http.HandleFunc(handlers.DEFAULT_PATH, handlers.DefaultPage)
+
+	//University info
+	http.HandleFunc(handlers.UNIVERSITYINFO_PATH, handlers.UniversityEntryPointHandler)
+
+	//Neighbour universities
+	http.HandleFunc(handlers.NEIGHBOUR_UNIVERSITIES_PATH, handlers.NeighbouringUnisHandler)
+
+	http.HandleFunc(handlers.DIAG_PATH, handlers.EntryPointHandler)
+
+	// Starting the server
+	log.Println("Starting server on port " + port + " ...")
+	log.Fatal(http.ListenAndServe(":"+port, nil))
+}