lotsa changes, but styling working, yay