Recreated Project. Now with better layout, tests, and architecture