Mapped out more of VS, added first basic test