Many changes... just in a hurry so commiting to protect my work