Finished implementing, this is a beta version as I have not tested everything yet
Updated some strings...