first push

Implemented new features