Finish System Framework

Need to work on specific functions