And.. a little more work..
Integrated Foundation 5 & created entity system for databse objects.