Things work now

but new things might be broken (part 4)