Commented out my stuff temporarily

It was creating an exception (see issues) that caused the app to crash.
I'll put it back in when I figure this out.
Merge branch 'screw-this'