progress

Mostly put together but missing traces