FIX: Add methods, clean up