Commit for VSWE

Hopefully he can help me with this.