Added the basic part of the system