Beta 0.1.1, Made it work for REAL!