Updated with notes and shit