Commit so i can merge changes
Added most of the functions we need, but not tested yet