Cleaned up some things.
Next up, effects?