More spell work

Last commit before major action rewrite