Worked on the layout some more.

Still need lots of work and connectors.