Now working fine. Still missing some features