Finished almost

Need to fix bugs