Class now partially works