Fleshed out boiler-plate a bit