Adding file for local testing.
Fixing some minor bugs