mostly working again!