Critiques are still not pretty or functioning well, but the basics are there
merge conflicts fixed