mostly working now..