besides that, looking pretty good :) any chance to add tests?