More Level One Implmentation
Merge Conflicts fixed