Huge update to current live code