Developer 645

Review and testing appreciated!