Logic Update p2
Revamp, almost ready
Integrated, but needs work