Initial changes

These chages were made initially. All 'fixme's should be considered with alternatives.