Battle changes, getting a final build working
merging august's stuff