now works. need work with naming however