skeleton there but some bugs