Sammys additions
Merging basics from both