second commit base code in full working order