Rounded up the first basic authentication & token routine issue #4 and #5