finished logic about to test

finished logic about to test