7 semi working

About to change logic of 7 completely