resolving now works, added in some skeleton functions as well