First commit on the hottruex branch