Code works fine, need to run some tests