Reverted to using messaging object

- Should probably break apart functionality at some point...
Almost back to former glory

- Why did I rewrite this if it ends up the same (almost)?