Board mainly finished, + tests