Basic functionality in place, tested and working