converted to laravel - revamped lots of stuff