first real commit

still needs testing!