Pushing up changes, trying to get this to flow correctly.