Removed old helpers file
Added basic features