More biset stuff in place