Comments partially integrated. Comments can be added. TODO: Delete comments, make form look better / match for comments.