Initial work

Ack. Will fix.