gaah i need to go through and fix this some time