Recreated the solution as it seems to be crashing VS for no reason