01/07/19 - Shaman Finished and Tweaks