organised and bug checked service bus stuff