working on more stuff ugh