Comments and structure... please follow comments and todos!