made things a lot cleaner :)
added an options hash and stuff
I can't tell if this is progress.. :P
made things a lot cleaner :)