Initial commit of work done 2 nights ago.