Fix for last commit

Also, a basic timer/request system is included, as starting point for
calendar stuff later...