Merged two boards into one for first batch.  Will split it into separate boards in next rev.