Todo added
Fix several bugs, and partialy implement Move functionality