Added simple login + framework additions