plus signs
implement some of the new templates
most of the stuff is working again