Fixes #3: Add self! FINALLY!