Everything mostly working now