Version 4 and 5 done

Everything should be working now.