Merge with personal laptop
Handle logout