More commenting, final & unfinished