Add Bitmap and Peer classes.  Need to test.