embrace the awesomeness of my commits

there is awesome source lurking behind these 8 commits. please take it.

also, it will be more secure(tm)