Made some changes to the model and resulting changes to everything else.
Merge pull request #2 from joshuawright11/master_lane

Lots of netbeans build file stuff.