Made progress towards encounter cards

Broke it
Organized old files