Fix potentially severe issue (needs fixing it everywhere else too)
Implement sprites