Work in progress and first fix to the second Milestone Fixes #7