Implement #19 I think