Finishing off injury

Finishing off injury stuff + proof of concept on orchard. 3am so im
gonna leave it