still kinda ugly but getting closer