Hopefully a more friendly API?