Further attribute/buff engine work