Should all be working. Transferring to server for testing