Layout Basically done, just need to test for certain execution cases