First pass at splitting tasks out into separate tables