Implemented final logic tree, few other tracking pieces