it's irksome to have 2 repos do the same thing. Seems like @vitei has a few changes that might be useful.