merging - still buggy. Will update again soon!