Functions should be ok. Still fixing ui