Added more code to test it live on the server...