Still not working but logic is implemented