Fixing routing to be more canon, added options layer.