TODO's added.
Settings refactored.