initial commit
cleanup part 1
cleanup basic strategy