merging sam and sheldons
version to be tested tomorrow
wtf?
starting fresh