Complete Sync with Dec

Added @DeclanProctor as collaborator