Server1/CP1

Current unresolved issues: