Functioning code base. Refining code. Commit 4