Basic version
APC edits
Small entrypoint fix