Added conditional statement to return if no default overrides passed through
Added intern for testing, added another task to todo and deleted old tests
Made several improvements, caching elements used in multiple places etc