95% finished -- not sure how to do the last method
Merge branch 'master' of https://github.com/acronos7021/Stare.git