Just finished up the first actual layout for the new board, a bit annoying to route around the FTDI chip, but everything connected up, allowing both the on board adapter, or an external serial controller to communicate with the device for programming.

Learning from previous mistakes, every pin is labelled on the silkscreen so once it comes back from manufacture, its alot easier to deal with