added some better boiler plate stuff