Updated w/new & awesome additions from bordaigorl