1. Refactoring
2. One (almost) complete contract uploader