added logic for brackets, reworked a couple models, and worked on some templates