Midnight progress

Client stuff