refactored all to working maybe?