Initial scaffold
work in progress
removed s- files
added a warning