Changing data handler into a singleton
Work in progress fixing the lecture model