working out some rats nest updates
still needs some looking over