Added determination of isCurrent

Still in progress