With the move coming up (by the end of this month), and the influx of pictures that I am expecting (as well as the hard drive space that they will require), Geoff and I were able to arrange a deal by turning in our old computers for two new laptops. I am still in the process of setting up the computer exactly how I want it, and I haven't had a chance to install my camera software yet (hopefully that will happen today, I have a ton of pictures that I want to get off my camera), but I now have a ton more space for photos, and a much faster processor. Windows 7 is also pretty nice, but to be honest, I never had a problem with Vista. I am now just waiting for Office 2010 to come out before I bother with that (I just hope that I don't have a need before then).
One more down!