drafts
lazy update
more editing
cleaned up