All test passing and feature working