Finish all current testing except view design

MEERRGEEEEE MEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE