added global includes
Initial implementation
Implementation in place, not debugged