Initial Commit, functionality working as expected, but with only minimal testing