converted to using Axon. It's pretty awesome