Merged in the Table and Record files worked on by Hamdan