More experimental code

it's not broken but it doesn't work