Initial Commit V6

We fixed a few BUGS! Ha! Get it? BUGS?! Ah...I'm lame...