Building simulator to get around limitations, added more handling to makebare