Intermediate changes

Some changes that aren't fully finished yet. Submitted to work on
another computer