Initial work

Will fix.