Working and tested version of fallback

Just needs url configuration stuff

Going to try something a bit more integrated test wise though - more
testing the behaviour than the implemnation