Initial changes, will redo most