Almost everything done! Still need to checkout tho ;s