Basic functionality fixed.