Added things i need to fix/remove in the final version