Edited pieces of my CS. Anything else need to be done? [@IcePezz][@ArenaSnow]