Theres still more to do but apparently not doing yet