added todo to existing systems
added changes from giovsanni to bycyklen
added giovanni todo