move query to settings
add unicorn
add rspec