First commit with proper configs