finish mini project... needs refactoring