code review
Got availability working
fixed merge conflicts