Adding Settings logic and some object passing