Feature complete for this stage, debugged! :-)