Functionally working now