Update Main

All functions as of 3/15/13 are included and work.