mostly working now