added todos re tables