Progress on Level implementation