Fixing up the infrastructure a little more