More preparation work for angrylion
(Angrylion) More additions/changes