Initial take at addressing #21