Initial work

Yeah, good point. Will fix.