changed a bunch, mostly working
are we done? maybe??
added some random data, although it's not entirely correct.