Comments added, working, don't look great