It's getting somewhere.. needs save functionality