Better callbacks

I need to use a promises library. this is ugly