Updated some stuff.. Going to work on this a little now.