Just did some serious work on those