implemented more of second stage
Merge branch 'master' of github.com:umeboshi2/paella