First commit with change of origin names. Might not work, needs testing