just fixing my branch and readding old assignments