Initial Commit
Initial refactoring before improving and creating the pod