Close #24

This is good enough for now, maybe revisit later.