All logic working minus drop