Mainly Complete Commit

2013.5.10 Commit