Source manager (almost) working