Fix some Logic Classes
Fix me removing stuff.
Merge pull request #8 from alexbegt/master

Fix some logic classes