Added some more functions, curious to see if merge really works or only compiles