Cleaned up solution and first commit for Abi