Tentative Final Code

Finalized computations and layout