Added all required functionality and beginning work on refresh controller