WIP

Made some quick fixes to keep the app from crashing, they are only
temporary and I have commented where I will make changes.