Added editing ability
Housecleaning
Added states listing function
Added functionality
Fixed minor bugs