moar logic
Fixing bugs