well still ugly but working