Continue the port, not quite done yet!