Mrkt initial deposit

Another refactor completed!

#583