Update as of 3-24-14

Changes to layout and prep work for array