Got alot done in this commit still need to do 11