Source redone without boost
Over hauled source.