tuesday update. basic concept is almost completed. some fixes needed