Skills properly propagated from one level to next

Still a lot of dirty things, but at least it seems to work-ish