This might change a little bit with #108