Initial changes

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