Major upates/cleanups to code. Added placeholders for chiqr and models