Refactor for recent engine changes - doesn't seem to quite work, miniion book isn't picking up empty cards (or a button is broken), but at least it compiles! Few checkstyle fixes too while in there