Little issues with cache resolved, still needs looking at