Updated dependencies
Clean up, start overhaul