Added the layout for calculating each table, just need to add the proper calculate methods