A working prototype v2