looks nice, still needs some tuning + todo from last commit