More work done
Working commit