Logic to Board refactor