status is now working
cleaned up models