Half finished work - no unit tests made for changes