Second Commit

Added more Logical and graphical units. Still needs to be finished .