Engine and library update
Logic Update

fixes #7