Commented out merge madness, added bubble sort