Deadlock det. almost done, seems to work prop.