Squashed commit of the following:

commit 6f0102113599a9811944ff755cb9b77477be9627
Author: Balraj Brar <balrajb@gmail.com>
Date:   Mon Mar 18 16:38:16 2013 +0000

    WIP
 WIP2