Terri wips

Finally! got it done, have sum wips