Merged Matt's code and moved files out of skeleten folder