Jb working

This completely up to date with my working branch as of 5-26-2014 9:30 PM.