Working on #17 incomplete, zero testing this is effectively broken