Updated architecture to try and get it working on the interwebz.