progress, static stuff not working yet, tests update to pass