Still not working, added attribute stuff