012: Bugs fixed - now working in principle...