SQUASH THIS - nonfinished code

a few changes and skeleton additions