just pr-ing

I feel like I re-wrote all your package. which kinda defeats the purpose of a pr. but here it is just in case you are interested