WIP - Got the table formating'