more style fixes
more style fixes
factored test out of file
basic compile of server
new hurdle, figure out how to mix subscriptions with my delivery method