Some more decorators to fully flesh this thing out