working 3.1

todo: media