implemented new oregen

Signed-off-by: TheTorbinWren <torbinwren@gmail.com>