Working on some stuff part 1