begin making this a bit more orderly