Requesting pulls for three separate commits, trying to fix cassius and template issues