added a bunch of skeleton shit
fix merge conflicts