Updated with current. Also added comments and "futures".