moved assets around, got card library in
merge stuff