These are my latest working commits @oapostrophec. cannot test right now (home). Enjoy