Merging progress back with main repo