Safe commit before major changes

Trying to merge two functions in to each other