Diagonal series

Extension of the work started in #238