I think both of these are mostly working