still ugly, but more functional..await cleaning