Angel Maker inheritance rework
Initial work Angel Maker Done. Now requires testing