More overload stuff, #46 still more tests needed