Added a bunch of stuff, I was not going to submit because it's not
finished, but since there were some problems... better push :S
fixed?
Merge remote-tracking branch 'origin/master'