Setting things up to work correctly, fixing some overall work solutions.