More work for #93
Technically closing #93 but we still have issues