Stop gap solution until I get around to standardizing this stuff