More constructs
More hacking
Minor