Moar better and stuff.

Forgo to commit, can't remember what I did anymore. here's the code at least.