more commits in extremely raw form. recommit whatever we do in class