New merged version with database connection draft and initial ATM window.