Added account stubs, improved timer