Will/js expansion

Based on #129