Trying to clean this up...looks like more merge issues.