rearrange solution, begin tests, move to xml