WIP
Dump status
WIP

Merge remote branch 'kim/server' into server

Conflicts:
	server.py
Merge remote-tracking branch 'dan/server' into server

Conflicts:
	server.py