updates to main - near completion