Merged everything, this will be the new master