closes #3 with visual improvements