All features added. 
Final stages of testing