This can probably be done in a different issue though.