all funcitonality added woot