90% final

should be mostly done