Major changes

Lots more magical stuff works!