Number of changes

loading + saving begun, some better logic? and some clean up