Added settings, now functional, beta phase 1