Merge changes through story #5 (board filled)