Dev

Changes to inadequate dashboard, this PR resolves #6