mostly working now...