Should totally work now. WARNING: UNTESTED