#50 Feature is almost completed. There should be some improvements