Some stuff added. Refactor issues