committing this, even though it is wrong and I need to rethink some of it