Commented in EC, will work on this more later.