Made the OrganiserManager More flexible + added it to the database