initial comit BUGS!!!