Managed to split solution up