Ready/149

For the first part of #149.