Closes #1 (for now) & Closes #2