Implemented bi-directional infrastructure

Wren O' Kelleher