diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..8e54fc4
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,85 @@
+#
+# SPDX-FileCopyrightText: 2020-present Open Networking Foundation <info@opennetworking.org>
+# SPDX-License-Identifier: LicenseRef-ONF-Member-1.01
+#
+define PROJECT_HELP_MSG
+Usage:
+    make help                   show this message
+    make clean                  remove intermediate files
+	make test					
+endef
+export PROJECT_HELP_MSG
+
+SHELL = bash -eu -o pipefail
+
+VERSION ?= $(shell cat ./VERSION)
+CONTAINER_NAME ?= $(notdir $(abspath .))
+
+DOCKER_REGISTRY          ?=
+DOCKER_REPOSITORY        ?=
+DOCKER_BUILD_ARGS        ?= --rm --force-rm
+DOCKER_TAG               ?= ${VERSION}
+DOCKER_IMAGENAME         := ${DOCKER_REGISTRY}${DOCKER_REPOSITORY}${CONTAINER_NAME}:${DOCKER_TAG}
+
+DOCKER_LABEL_VCS_URL     ?= $(shell git remote get-url $(shell git remote))
+DOCKER_LABEL_VCS_REF     ?= $(shell git diff-index --quiet HEAD -- && git rev-parse HEAD || echo "unknown")
+DOCKER_LABEL_COMMIT_DATE ?= $(shell git diff-index --quiet HEAD -- && git show -s --format=%cd --date=iso-strict HEAD || echo "unknown" )
+DOCKER_LABEL_BUILD_DATE  ?= $(shell date -u "+%Y-%m-%dT%H:%M:%SZ")
+
+VENV = venv
+PYTHON = $(VENV)/bin/python3
+PIP = $(VENV)/bin/pip
+
+all: test
+
+help:
+	echo "$$PROJECT_HELP_MSG" | less
+
+$(VENV): $(VENV)/touchfile
+
+$(VENV)/touchfile: requirements.txt
+	test -d $(VENV) || python3 -m venv $(VENV)
+	. $(VENV)/bin/activate; pip install -Ur requirements.txt
+	touch $(VENV)/touchfile
+
+$(VENV)/bin/activate: requirements.txt
+	python3 -m venv $(VENV)
+	$(PIP) install -r requirements.txt
+
+freeze:
+	pip3 freeze | grep -v "pkg-resources" > requirements.txt
+
+docker-build: $(VENV)
+	docker build $(DOCKER_BUILD_ARGS) \
+		-t $(DOCKER_IMAGENAME) \
+		--build-arg org_label_schema_version="${VERSION}" \
+    	--build-arg org_label_schema_vcs_url="${DOCKER_LABEL_VCS_URL}" \
+    	--build-arg org_label_schema_vcs_ref="${DOCKER_LABEL_VCS_REF}" \
+    	--build-arg org_label_schema_build_date="${DOCKER_LABEL_BUILD_DATE}" \
+    	--build-arg org_opencord_vcs_commit_date="${DOCKER_LABEL_COMMIT_DATE}" \
+		-f docker/Dockerfile .
+
+docker-push:
+	docker push $(DOCKER_IMAGENAME)
+
+docker-run:
+	docker run \
+		-itu root:root \
+		--privileged \
+		--network host \
+		--name $(CONTAINER_NAME) \
+		--rm \
+		$(DOCKER_IMAGENAME)
+
+lint:
+	flake8 --exclude=.tox network_diag
+
+test: docker-build
+
+
+CLEANUP = *.pyc $(VENV)
+clean:
+	rm -rf ${CLEANUP}
+
+.PHONY: run clean
+
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e8095d4
--- /dev/null
+++ b/README.md
@@ -0,0 +1,3 @@
+# Network Diagnostics Application for Aether Edge
+
+## TBD
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..c0ab82c
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+0.0.1-dev
diff --git a/docker/Dockerfile b/docker/Dockerfile
new file mode 100644
index 0000000..ab01eba
--- /dev/null
+++ b/docker/Dockerfile
@@ -0,0 +1,6 @@
+FROM python:3
+ADD networkdiag.py /
+RUN pip install flask
+RUN pip install flask_restful
+EXPOSE 3333
+CMD [ "python", "./networkdiag.py"]
diff --git a/networkdiag.py b/networkdiag.py
new file mode 100644
index 0000000..315850c
--- /dev/null
+++ b/networkdiag.py
@@ -0,0 +1,14 @@
+from flask import Flask, request
+from flask_restful import Resource, Api
+
+app = Flask(__name__)
+api = Api(app)
+
+class Greeting (Resource):
+    def get(self):
+        return 'Hello World!'
+
+api.add_resource(Greeting, '/') # Route_1
+
+if __name__ == '__main__':
+    app.run('0.0.0.0','3333')
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 0000000..abb1c27
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,15 @@
+aniso8601==9.0.1
+click==8.0.3
+dataclasses==0.8
+Flask==2.0.2
+Flask-RESTful==0.3.9
+importlib-metadata==4.8.3
+itsdangerous==2.0.1
+Jinja2==3.0.3
+MarkupSafe==2.0.1
+pkg-resources==0.0.0
+pytz==2021.3
+six==1.16.0
+typing-extensions==4.0.1
+Werkzeug==2.0.2
+zipp==3.6.0