Fixed build and made several minor changes therin. Will have to discuss input strategy at next meeting. But, otherwise code works fine.