Development build 1 aug

Almost done