first commit in new repo, refactored to be more sustainable structure