Work on heartbeat stuff and server stuff

Possible fixes