pretty much everything from now on will just be layout changes and adding comments