Added Code and descriptors from HW 1+  Extended type system + fixed deps