Added Z drivers
Removed unfinished items