major changes to get it running