Project service stuff being built
merged Justins user.py change with mine