Initial commit - Code along with 2 feature tables