Bit buggy but some working