Updating to mostly finished one sound version