Mostly working now