OP-1245 Re-factored saving to board. Added code to save more things.