Began adding commands

Also fixed some bugs, removed dual heartbeats (just commented) as it
causes too many issues.