Added logic up until the end of propositional calculus