some additions .. wont compile yet