Lots of changes to Board System