Stuff that works now

yay!