fbeauvais is spot on and i would go with invoice 2 and combine the two. not sure about the hourly prices but the set up is right in my opinion.