Working changes

Needed to change lilltle things before we go further