In Progress

Completed some functions - ongoing work