added code and stuff from other repo for messing with