Some stuff

Will make more progress after thursday midterm