major refactoring, tried to add timeline support, but keep getting 404 error from the subscriber, stuck for now