more work
moving a lot of stuff around
moer
fixing sample stuff