Moved some more stuff over to Aroma1997Core.
Hoping it works now.