Working on some stuff part 2