Polished model classes to bring in basic functionality. Board needs to be rewritten.