Merge branch 'DEVELOPMENT' into issue_21
Merge branch 'DEVELOPMENT' into issue_21
filled in setup_source with control panel check, if statements to be filled with things to be brought over later
forgot to note for issue #21 commit