working board
Leo's refactors