Title: David gets Jans HUGE changes and merges it to his own branch