Attempting hackey merge