Rollback of 14 January

Sorry Kyle. This version has your coding inside it. Please check it !