New stuff
basic structure and non-functional search
Merge branch 'master' of https://github.com/goronfreeman/JustForSteph