latching this foooooooool. also, updating the dia diagram
Merge https://github.com/Nerylix/437 into riley