Removed testing code
Merged files
Design fixes