First commit trying to make this work.