#84 omg this needs testing!